Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Oct 2011 06:38:24 +0000 (23:38 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Oct 2011 06:38:24 +0000 (23:38 -0700)
commitde4b58d9a998d926a7ff220e48910156e9af96cc
tree21dc1bbacb2df7e5d039daba268f0c16817dfd46
parent596d161d6015d019b49fd3d3c4536eff2606491d
parent1091089de1bf4ac9799380196047378d5b0f4b00
Merge from trunk.
src/ChangeLog
src/bidi.c
src/dispextern.h
src/editfns.c
src/xdisp.c